[libcxx] [test] D27018: Fix MSVC warning C4018 "signed/unsigned mismatch", part 5/12. Various changes: test/std/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp Change M from unsigned to int. It's compared against "int x", and we binary_search() for it within a vector<int>. test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval.pass.cpp test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval_param.pass.cpp Add static_cast<unsigned> when comparing int to unsigned. test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp Change unsigned indices to int when we're being given int as a bound. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@287825 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/std/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp b/test/std/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp index 1f74a9a..d4d31cb 100644 --- a/test/std/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp +++ b/test/std/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
@@ -34,7 +34,7 @@ test() { const unsigned N = 1000; - const unsigned M = 10; + const int M = 10; std::vector<int> v(N); int x = 0; for (std::size_t i = 0; i < v.size(); ++i) diff --git a/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval.pass.cpp b/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval.pass.cpp index 091bbb9..4da7f2e 100644 --- a/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval.pass.cpp +++ b/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval.pass.cpp
@@ -34,7 +34,7 @@ I(double x, unsigned a, unsigned b) { double r = 0; - for (int j = a; j <= a+b-1; ++j) + for (int j = a; static_cast<unsigned>(j) <= a+b-1; ++j) r += fac(a+b-1)/(fac(j) * fac(a + b - 1 - j)) * std::pow(x, j) * std::pow(1-x, a+b-1-j); return r; diff --git a/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval_param.pass.cpp b/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval_param.pass.cpp index 7741371..74025b7 100644 --- a/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval_param.pass.cpp +++ b/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval_param.pass.cpp
@@ -34,7 +34,7 @@ I(double x, unsigned a, unsigned b) { double r = 0; - for (int j = a; j <= a+b-1; ++j) + for (int j = a; static_cast<unsigned>(j) <= a+b-1; ++j) r += fac(a+b-1)/(fac(j) * fac(a + b - 1 - j)) * std::pow(x, j) * std::pow(1-x, a+b-1-j); return r; diff --git a/test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp b/test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp index 60d41b1..81b4b77 100644 --- a/test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp +++ b/test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp
@@ -62,7 +62,7 @@ S s2(n, c); LIBCPP_ASSERT(s2.__invariants()); assert(s2.size() == n); - for (unsigned i = 0; i < n; ++i) + for (int i = 0; i < n; ++i) assert(s2[i] == c); assert(s2.get_allocator() == A()); assert(s2.capacity() >= s2.size()); @@ -78,7 +78,7 @@ S s2(n, c, a); LIBCPP_ASSERT(s2.__invariants()); assert(s2.size() == n); - for (unsigned i = 0; i < n; ++i) + for (int i = 0; i < n; ++i) assert(s2[i] == c); assert(s2.get_allocator() == a); assert(s2.capacity() >= s2.size());
